a3c915ed461b8a8b0c740b7efdba96e030ee8f0e,src/main/java/com/pantherman594/gssentials/command/general/FriendCommand.java,FriendCommand,execute,#CommandSender#String[]#,52
Before Change
}
TextComponent finalMsg = new TextComponent(TextComponent.fromLegacyText(Dictionary.format(Dictionary.FRIEND_BODY, "NAME", name, "SERVER", server)));
if (!server.equals("Offline")) {
finalMsg.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/server " + server));
finalMsg.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Click to join your friend!").create()));
}
sender.sendMessage(finalMsg);
}
sender.sendMessage(Dictionary.format(Dictionary.OUTREQUESTS_HEADER, "COUNT", String.valueOf(playerData.getOutRequests().size())));
for (String uuid : playerData.getOutRequests()) {
String name;
if (ProxyServer.getInstance().getPlayer(UUID.fromString(uuid)) != null) {
name = ProxyServer.getInstance().getPlayer(UUID.fromString(uuid)).getName();
} else {
name = (new PlayerData(uuid, null)).getName();
}
sender.sendMessage(Dictionary.format(Dictionary.OUTREQUESTS_BODY, "NAME", name));
}
sender.sendMessage(Dictionary.format(Dictionary.INREQUESTS_HEADER, "COUNT", String.valueOf(playerData.getInRequests().size())));
for (String uuid : playerData.getInRequests()) {
String name;
if (ProxyServer.getInstance().getPlayer(UUID.fromString(uuid)) != null) {
name = ProxyServer.getInstance().getPlayer(UUID.fromString(uuid)).getName();
} else {
name = (new PlayerData(uuid, null)).getName();
}
TextComponent finalMsg = new TextComponent(TextComponent.fromLegacyText(Dictionary.format(Dictionary.INREQUESTS_BODY, "NAME", name)));
finalMsg.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/friend add " + name));
finalMsg.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Click to accept friend request!").create()));
sender.sendMessage(finalMsg);
}
} else if (args.length == 2 && (args[0].equalsIgnoreCase("add") || args[0].equalsIgnoreCase("remove"))) {
ProxiedPlayer p = ProxyServer.getInstance().getPlayer(args[1]);
String uuid;
PlayerData playerData2;
if (p != null) {
uuid = p.getUniqueId().toString();
playerData2 = PlayerData.getData(p.getUniqueId());
} else {
uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + args[1]).getBytes(StandardCharsets.UTF_8)).toString();
playerData2 = new PlayerData(uuid, null);
}
if (args[0].equalsIgnoreCase("add")) {
if (playerData.getFriends().contains(uuid)) {
sender.sendMessage(Dictionary.format(Dictionary.FRIEND_OLD, "NAME", args[1]));
} else {
if (p != null && !PlayerData.getData(p.getUniqueId()).isHidden()) {
playerData2 = PlayerData.getData(p.getUniqueId());
uuid = p.getUniqueId().toString();
if (playerData.getInRequests().contains(uuid)) {
playerData.getInRequests().remove(uuid);
playerData.getFriends().add(uuid);
playerData2.getOutRequests().remove(((ProxiedPlayer) sender).getUniqueId().toString());
playerData2.getFriends().add(((ProxiedPlayer) sender).getUniqueId().toString());
p.sendMessage(Dictionary.format(Dictionary.FRIEND_NEW, "NAME", sender.getName()));
sender.sendMessage(Dictionary.format(Dictionary.FRIEND_NEW, "NAME", p.getName()));
} else if (!playerData.getOutRequests().contains(uuid)) {
playerData.getOutRequests().add(uuid);
playerData2.getInRequests().add(((ProxiedPlayer) sender).getUniqueId().toString());
TextComponent finalMsg = new TextComponent(TextComponent.fromLegacyText(Dictionary.format(Dictionary.INREQUESTS_NEW, "NAME", sender.getName())));
finalMsg.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/friend add " + sender.getName()));
finalMsg.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Click to accept friend request!").create()));
p.sendMessage(finalMsg);
sender.sendMessage(Dictionary.format(Dictionary.OUTREQUESTS_NEW, "NAME", p.getName()));
} else {
After Change
}
@Override
public void execute(CommandSender sender, String[] args) {
if (sender instanceof ProxiedPlayer) {
PlayerData playerData = PlayerData.getData(((ProxiedPlayer) sender).getUniqueId());
if (args.length == 0 || (args.length == 1 && args[0].equalsIgnoreCase("list"))) {
sender.sendMessage(Dictionary.format(Dictionary.FRIEND_HEADER, "COUNT", String.valueOf(playerData.getFriends().size())));
for (String uuid : playerData.getFriends()) {
String server = "Offline";
String name;
if (ProxyServer.getInstance().getPlayer(UUID.fromString(uuid)) != null) {
server = ProxyServer.getInstance().getPlayer(UUID.fromString(uuid)).getServer().getInfo().getName();
name = ProxyServer.getInstance().getPlayer(UUID.fromString(uuid)).getName();
} else {
name = (new PlayerData(uuid, null)).getName();
}
sender.sendMessage(Dictionary.format(Dictionary.FRIEND_BODY, "NAME", name, "SERVER", server));
}
sender.sendMessage(Dictionary.format(Dictionary.OUTREQUESTS_HEADER, "COUNT", String.valueOf(playerData.getOutRequests().size())));
for (String uuid : playerData.getOutRequests()) {
String name;
if (ProxyServer.getInstance().getPlayer(UUID.fromString(uuid)) != null) {
name = ProxyServer.getInstance().getPlayer(UUID.fromString(uuid)).getName();
} else {
name = (new PlayerData(uuid, null)).getName();
}
sender.sendMessage(Dictionary.format(Dictionary.OUTREQUESTS_BODY, "NAME", name));
}
sender.sendMessage(Dictionary.format(Dictionary.INREQUESTS_HEADER, "COUNT", String.valueOf(playerData.getInRequests().size())));
for (String uuid : playerData.getInRequests()) {
String name;
if (ProxyServer.getInstance().getPlayer(UUID.fromString(uuid)) != null) {
name = ProxyServer.getInstance().getPlayer(UUID.fromString(uuid)).getName();
} else {
name = (new PlayerData(uuid, null)).getName();
}
sender.sendMessage(Dictionary.format(Dictionary.INREQUESTS_BODY, "NAME", name));
}
} else if (args.length == 2 && (args[0].equalsIgnoreCase("add") || args[0].equalsIgnoreCase("remove"))) {
ProxiedPlayer p = ProxyServer.getInstance().getPlayer(args[1]);